Autogenerated HTML docs for v1.7.4
diff --git a/git-stash.html b/git-stash.html index a720fe6..3ed1da0 100644 --- a/git-stash.html +++ b/git-stash.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-stash(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-stash(1)</title> </head> <body> <div id="header"> @@ -318,32 +412,34 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git stash</em> list [<options>] +<div class="verseblock-content"><em>git stash</em> list [<options>] <em>git stash</em> show [<stash>] <em>git stash</em> drop [-q|--quiet] [<stash>] <em>git stash</em> ( pop | apply ) [--index] [-q|--quiet] [<stash>] <em>git stash</em> branch <branchname> [<stash>] <em>git stash</em> [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] <em>git stash</em> clear -<em>git stash</em> create</div></div> +<em>git stash</em> create</div> +<div class="verseblock-attribution"> +</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Use <tt>git stash</tt> when you want to record the current state of the +<div class="paragraph"><p>Use <tt>git stash</tt> when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the <tt>HEAD</tt> commit.</p></div> -<div class="para"><p>The modifications stashed away by this command can be listed with +<div class="paragraph"><p>The modifications stashed away by this command can be listed with <tt>git stash list</tt>, inspected with <tt>git stash show</tt>, and restored (potentially on top of a different commit) with <tt>git stash apply</tt>. Calling <tt>git stash</tt> without any arguments is equivalent to <tt>git stash save</tt>. A stash is by default listed as "WIP on <em>branchname</em> …", but you can give a more descriptive message on the command line when you create one.</p></div> -<div class="para"><p>The latest stash you created is stored in <tt>refs/stash</tt>; older +<div class="paragraph"><p>The latest stash you created is stored in <tt>refs/stash</tt>; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. <tt>stash@{0}</tt> is the most recently created stash, <tt>stash@{1}</tt> is the one before it, <tt>stash@{2.hours.ago}</tt> @@ -351,8 +447,8 @@ </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>] </dt> <dd> @@ -360,22 +456,22 @@ Save your local modifications to a new <em>stash</em>, and run <tt>git reset --hard</tt> to revert them. The <message> part is optional and gives the description along with the stashed state. For quickly making - a snapshot, you can omit _both_ "save" and <message>, but giving + a snapshot, you can omit <em>both</em> "save" and <message>, but giving only <message> does not trigger this action to prevent a misspelled subcommand from making an unwanted stash. </p> -<div class="para"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the +<div class="paragraph"><p>If the <tt>--keep-index</tt> option is used, all changes already added to the index are left intact.</p></div> -<div class="para"><p>With <tt>--patch</tt>, you can interactively select hunks from in the diff +<div class="paragraph"><p>With <tt>--patch</tt>, you can interactively select hunks from in the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree.</p></div> -<div class="para"><p>The <tt>--patch</tt> option implies <tt>--keep-index</tt>. You can use +<div class="paragraph"><p>The <tt>--patch</tt> option implies <tt>--keep-index</tt>. You can use <tt>--no-keep-index</tt> to override this.</p></div> </dd> -<dt> +<dt class="hdlist1"> list [<options>] </dt> <dd> @@ -391,10 +487,10 @@ <pre><tt>stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation stash@{1}: On master: 9cc0589... Add git-stash</tt></pre> </div></div> -<div class="para"><p>The command takes options applicable to the <em>git log</em> +<div class="paragraph"><p>The command takes options applicable to the <em>git log</em> command to control what is shown and how. See <a href="git-log.html">git-log(1)</a>.</p></div> </dd> -<dt> +<dt class="hdlist1"> show [<stash>] </dt> <dd> @@ -406,7 +502,7 @@ -p stash@{1}</tt> to view the second most recent stash in patch form). </p> </dd> -<dt> +<dt class="hdlist1"> pop [--index] [-q|--quiet] [<stash>] </dt> <dd> @@ -416,17 +512,17 @@ operation of <tt>git stash save</tt>. The working directory must match the index. </p> -<div class="para"><p>Applying the state can fail with conflicts; in this case, it is not +<div class="paragraph"><p>Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call <tt>git stash drop</tt> manually afterwards.</p></div> -<div class="para"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working -tree's changes, but also the index's ones. However, this can fail, when you +<div class="paragraph"><p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working +tree’s changes, but also the index’s ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally).</p></div> -<div class="para"><p>When no <tt><stash></tt> is given, <tt>stash@{0}</tt> is assumed, otherwise <tt><stash></tt> must +<div class="paragraph"><p>When no <tt><stash></tt> is given, <tt>stash@{0}</tt> is assumed, otherwise <tt><stash></tt> must be a reference of the form <tt>stash@{<revision>}</tt>.</p></div> </dd> -<dt> +<dt class="hdlist1"> apply [--index] [-q|--quiet] [<stash>] </dt> <dd> @@ -436,7 +532,7 @@ <tt>stash save</tt> or <tt>stash create</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> branch <branchname> [<stash>] </dt> <dd> @@ -448,13 +544,13 @@ <tt>stash@{<revision>}</tt>, it then drops the <tt><stash></tt>. When no <tt><stash></tt> is given, applies the latest one. </p> -<div class="para"><p>This is useful if the branch on which you ran <tt>git stash save</tt> has +<div class="paragraph"><p>This is useful if the branch on which you ran <tt>git stash save</tt> has changed enough that <tt>git stash apply</tt> fails due to conflicts. Since the stash is applied on top of the commit that was HEAD at the time <tt>git stash</tt> was run, it restores the originally stashed state with no conflicts.</p></div> </dd> -<dt> +<dt class="hdlist1"> clear </dt> <dd> @@ -464,7 +560,7 @@ <em>Examples</em> below for a possible strategy). </p> </dd> -<dt> +<dt class="hdlist1"> drop [-q|--quiet] [<stash>] </dt> <dd> @@ -475,7 +571,7 @@ <tt>stash@{<revision>}</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> create </dt> <dd> @@ -488,7 +584,7 @@ </div> <h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<div class="para"><p>A stash is represented as a commit whose tree records the state of the +<div class="paragraph"><p>A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at <tt>HEAD</tt> when the stash was created. The tree of the second parent records the state of the index when the stash is made, and it is made a child of @@ -499,14 +595,14 @@ / / -----H----I</tt></pre> </div></div> -<div class="para"><p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state +<div class="paragraph"><p>where <tt>H</tt> is the <tt>HEAD</tt> commit, <tt>I</tt> is a commit that records the state of the index, and <tt>W</tt> is a commit that records the state of the working tree.</p></div> </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> Pulling into a dirty tree </dt> <dd> @@ -516,7 +612,7 @@ doing. When your local changes do not conflict with the changes in the upstream, a simple <tt>git pull</tt> will let you move forward. </p> -<div class="para"><p>However, there are cases in which your local changes do conflict with +<div class="paragraph"><p>However, there are cases in which your local changes do conflict with the upstream changes, and <tt>git pull</tt> refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:</p></div> @@ -530,7 +626,7 @@ $ git stash pop</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> Interrupted workflow </dt> <dd> @@ -552,7 +648,7 @@ $ git reset --soft HEAD^ # ... continue hacking ...</tt></pre> </div></div> -<div class="para"><p>You can use <em>git stash</em> to simplify the above, like this:</p></div> +<div class="paragraph"><p>You can use <em>git stash</em> to simplify the above, like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt># ... hack hack hack ... @@ -563,7 +659,7 @@ # ... continue hacking ...</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> Testing partial commits </dt> <dd> @@ -585,7 +681,7 @@ $ git commit foo -m 'Remaining parts'</tt></pre> </div></div> </dd> -<dt> +<dt class="hdlist1"> Recovering stashes that were cleared/dropped erroneously </dt> <dd> @@ -606,22 +702,22 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-checkout.html">git-checkout(1)</a>, +<div class="paragraph"><p><a href="git-checkout.html">git-checkout(1)</a>, <a href="git-commit.html">git-commit(1)</a>, <a href="git-reflog.html">git-reflog(1)</a>, <a href="git-reset.html">git-reset(1)</a></p></div> </div> <h2 id="_author">AUTHOR</h2> <div class="sectionbody"> -<div class="para"><p>Written by Nanako Shiraishi <nanako3@bluebottle.com></p></div> +<div class="paragraph"><p>Written by Nanako Shiraishi <<a href="mailto:nanako3@bluebottle.com">nanako3@bluebottle.com</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:56:58 UTC +Last updated 2010-09-04 16:22:43 UTC </div> </div> </body> 